[IA64] Fix LOAD_PHYSCAL macro

This fix is workaround. Now LOAD_PHYSCAL is used only
by MCA/INIT handler.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>

diff --git a/xen/include/asm-ia64/linux-xen/asm/asmmacro.h b/xen/include/asm-ia64/linux-xen/asm/asmmacro.h
index 77af457f4ad724d83094f6df4e26fb4f68d0e924..ca0fd9547769e55e7e17d3764cdeb25b6c6a5757 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/asmmacro.h
+++ b/xen/include/asm-ia64/linux-xen/asm/asmmacro.h
@@ -59,9 +59,17 @@ name:
        .section ".data.patch.vtop", "a"        // declare section & section attributes
        .previous
 
+#ifdef XEN
+#define        LOAD_PHYSICAL(pr, reg, obj)             \
+[1:](pr)movl reg = obj;;                       \
+       shl reg = reg,4;;                       \
+       shr.u reg = reg,4;;                     \
+       .xdata4 ".data.patch.vtop", 1b-.
+#else
 #define        LOAD_PHYSICAL(pr, reg, obj)             \
 [1:](pr)movl reg = obj;                                \
        .xdata4 ".data.patch.vtop", 1b-.
+#endif
 
 /*
  * For now, we always put in the McKinley E9 workaround.  On CPUs that don't need it,